Try to move this to a template in an upcoming iteration