Introduce Mapping Class, removed navigation controls.
Clean Up

Removed imports not needed, removed parameters that were declared during
__init__ function.
More Cleanup

Trying to whittle down the time.