In-progress mapping work for tutorial.
Merge branch 'master' of https://github.com/Flux159/Polymorph