More work on states

Currently broken.
Also removed SDL_image
States are now working