Starting work on cleaning up the map system

Signed-off-by: retep998 <retep998@verizon.net>