Adhered to previous merge request. Left some sneaky code to populate demo values in peakPeriod in constructor of BillingSystem class... but don't tell Yong