updated lots of stuff dealing with schematics
added map class