Add some more stuff with graphics and some other stuff that was previously forgotten