Moving things around, updated ConnectionHandler