New Stuff for my friend the Refactorinator Jakob