Adds location model. Closes #21