Work in progress. Huge refactoring, rethinking, structures, flows, waits, parallel, stuff.