Renamed functions, added TODOs, tidied Simulation class up.