Started working on handling the database