Massive refactor of pretty much everything, CC is disabled atm, and there may be regressions