Massacred old code for cleanup, slowly re-adding code and keeping everything modular