minor changes
commit pre-major re-org
commit half way through major re-org
breakpoint
minor tweak
post re-arrangement
finished almost all linting
major breakpoint