Moved over to new connection system. WIP