Simulation WIP

Work in progress for Simulation state.