Yes, always rig it fully, on land, to make sure all the little parts are there, then disconnect the mainsheet if you must (wind direction is important) to launch, point it into the wind and reconnect it. Ttrying to improvise on the water will only get you into a spot you cannot get out of.