DAO Update

Another DAO update, nearly complete. Finished implementing the methods.
Still some errors when some data is not populated. needs more testing