Implemented upconnect, tests passing