Fuckin'
Fixed things
Actual fix
Made thing an abstract base class that will become 'drawable'
Fixed merge