Major restructure. Moar clean and now with testing ability