added map and lots of methods
added map and lots of methods!