Moritz Jack Remake

Collaboration between myself and @MoritzS. He'll get the money at the end though. Having this in a pull request will make it easier to see and discuss the changes it entails, and makes the Travis test status a bit more visible.