reorganization
a cute map class
FIXED BUGS AGAIN.