Added mapmaker - looking good so far.
Need to work on caching objecs
Commiting mapmaker.