Updated db

completed db and User class changes