Refactor all the things
Return removed MapLayer
Return removed MapObject
Add basic views
Hook it all together