Some grooming, started building the to-be-huge getBottlenecks-function