Add disconnect method, use more templated calls.
Spaces to tabs.
Rename file to final name.