More work. Not sure how to do connection selection