Fixed up database creation, working on search function