Disconnect disband

This is a continuation of #121 but with all the comments addressed