Checking on how to move this to the database