Review recent spike/work for data structures or organizing models that would materially simplify the code.
