Revert "Revert "Connor TODO Things""

This reverts commit 65addac0c3f70e38708ff2faae4a4e493ce18c63.