getting-there on the id refactor