Started work on Image Stuff, added tests. Tweaked some code, and stuff