Cleanup/TODO

Lets start refactoring and the like.