WIP

WIP: getting internal-restructuring feature parity with master, this includes some WIP refactoring's to handle missing features, and improve clarity.