NEW: Gamestates

also cleaning up some interfaces and editing stuff