Remaining work reshuffling

work in progress document moved to here, for commenting