Almost done, just the database error left to fix