Finished the DAO layer and started worok on the service layer