Removed code for database as that is not working yet.