Initial code refactor
Stuff