Major reconstruction of the connection class to better support pre-shuffle hotel builds.