This update is going to be pretty big. After this I need to do a lot of stuff behind the scenes. More bug fixes than features.
