Revert "Missed a change in the last commit"

This reverts commit ec17fe856a55f6b25270cd4e7da37a1274b08016.
Revert "Current path toward async control won't work"

This reverts commit a04635b34657a30c69ffbc109f56cc2c8a08c84d.
Working out structure for interface