Massive changes! Simulators working!