Extended Shape and Ray classes

Short burst of motivation gone again