Merge dev_ben into develop

Merge my crappy dev branch into the main development branch so I can start using the proper feature branch system.