temp progress
get primitives working
Merge branch 'primitives'