Conn 565

This PR has a lot of files changed, I suggest reviewing it commit by commit to get context on what the changes are, this way it'll be a little more consumable.