Map stuff

Signed-off-by: craigmoliver <craigmoliver@gmail.com>
Merge branch 'hugh'