More primitives

Plus better test demo