resolved EVERYTHING with the database