First commit of simulator