As someone adding a surf pipe and heater to my 21 Makai I would highly recommend getting it done from factory. I kick myself for not getting them on the original order. Welcome and from one first time surfboat owner to another you guys are gonna love it. I'll also add that you should also plan to upgrade ballast after delivery. It's a relatively cheap upgrade with huge results on the primary function of the boat. You can rear bags that literally just drop into replace the factory rears and you have do is readjust the fill timer.