2014-10-09 McRev4 Commit 1

Some changes in map. Not finished, WIP.