rewrote all DAOs and updated classes that use these DAOs