Port the DAO changes from RangerRick into the ng project
Merge branch 'working'