Reverting "Trying to split things out."
Revert "Trying to split things out."

This reverts commit 31fe793d64767ca10e666cecf3cdc2a8b6ecf08f.