Changed some static methods in MapObject to instance methods.  Broke MapHandler while eliminating data duplication.  Needs fixing.