pretty much overhauled a bunch of stuff, plus reorganization