Small updates

Doesn't actually make the changes needed to avoid bad state, but makes
some changes in the right direction
Progress commit of networking update

Still doesn't work, but does connect successfully once, then starts
failing.
Switch to state machine