Added Simulator class

deleted 15 warnings but created 8 new :)