Issue #287

Add many and list all working
Issue #310

Update to Location Dao class and related