Trim primitive shapes

[TimoL]

thanks so much @paulgoux.

I haven’t had a chance to look at your code just yet but I really appreciate your help so far