two space indent
starting and stopping does not work
all tests passing
remove forceDisconnect
reset dirty merge
merge into acceptable version