Removing old code & fixing the connect button. The button hasn't been tested yet.