work on #33, have the database expiration working properly, need to test