Riker work
Merge branch 'master' into nick_exp
Reconnect uses timers now
Reconnect uses timers now