Getting stuff together, fixups all over the places.
Top level for simulation