Added initial simulator work