Closer to finished simulator