Move towards building flat lists.
Reorganize.
Continuing to flatten things out.
Refactor.