Stuff!

Overhauled lots of stuff, only visible changes are in menu level, and
the settings menu.