aborted attempt to introduce simulator abstraction
rolled back simulator abstraction