Database and Usertable mostly complete