still need to fix the db, going to sleep :)