Refactoring a lot of things. FYI: this is horribly broken ATM and most likely will seg fault if it even starts :D