Started map implementation
Mostly done with map...mostly...
Map complete, needs to be optimized
Merge branch 'dev'