organizing code, expanding RoboMap usage