Nice job! Did you draw the plans from scratch in CAD? BTW, I also have a Contest 36S, fractional rig. Mine is an 1986 model. Got her 2 years ago, keeping her on the upper Chesapeake. Name is s/v First Light....