Last push didn't go through, here is the primitive shape drawing stuff.