Reworked shape primitives extrude function & split out curved shapes