SIMULATOR: Multiple modes, and better naming of parts