PrimitiveBase - first implementation
updated to work with primitive base...
Merge remote-tracking branch 'origin/master'