`TODO` following code review to split this up?