Feature/map

Closes #1.