holy smokes batman, that's a big refactor. 1.6.2 upgrade, not 100% finished