prep monday - adds some more organization

(relies on using the hackpad separately for partial-class adjustments)