Massive overhall, Lots of changes, Should still have all previous functionality