Major refactoring

-Much easier to pull from db
-reduced code by a tonne