WIP
Fixing up prim processing