Cleaned problems
Refactoring: Factoring out some code.
Merge branch 'master' of github.com:Jacco/Perpetuality into map_n_controls