Added more primitives
This merge stinks
Ugly merge is ugly twice