Add of stage checking in primitives

(closes #72)