Starting refactoring of peer calcs