getting there (refactor)