Mind the Map [Closes #69]