Completed my own databse