moving to just using the database