Refactor controller conn concurrency
WIP
More WIP work
Begin testing supervisor
Unify types
More supervisor testing