Architecture operating system changes

This is just for review. It isn't ready to be merged yet.