work-in-progress refactoring connection calculators