Locations

fixes issue #22 

Note that this requires a database reset to be implemented properly.