Messy commit.
Preparing for refactor.