Changes before q-comm overhaul to q-connection