Location mapper and tests

Closes #23