Intermediate commit.
Staged commit to allow Connor to work on the code.