WIP Simulator rebuild.