Refactor perPeriod funding (not completed)