Add ability to specify what to connect to via COM