Map stuff

Signed-off-by: craigmoliver <craigmoliver@gmail.com>
Merge branch 'hugh'
Merge branch 'hugh' of https://github.com/craigmoliver/mist7571-team_awesome into hugh