Bringing in code from Jay's version, preparing for desired refactor
Bringing in code from Jay's version, preparing for desired refactor

logicleague/double_booked,bigfleet/accountable,logicleague/double_booked,bigfleet/accountable