Subsystem restructuring. Please avoid merging stuff which would conflict with this. This took days to update.

some recent merges were lost due to entire conflicting files. I did ask nicely.
oh ok, dunno what's going on with the diff here. that sleep(50) looks out of place. and there's a \No Newline there as well.