updated DAO objects to have most of their proper operations and new architecture. Tested that everything works as before