make building easier
make state smarter
Merge branch 'feature/smart_connect_disconnect' into staging