#77 - Removing old stuff
#77 - Refactoring
#77 - Yeah, refactoring bitch
#77 - Refactoring time sadness