Added functionality to pick and move primatives