Final changes to shapes class.
Reference to Dr Fraser's video.