Working now on the store DAO with a little bit of cleanup in other classes