move this to class?