Merge the rewritten controller and states into master

Now we can start coding with the new stuff.