Devel/map suggestion

Safety first here, The map suggestion should just have the revamped map, and shouldn't mess up anything in master, but just to be safe I've created a branch of the current master to test the merge, if everything looks good I'll pull the mergeTest branch into the master.