Done with Shape excersie

Now tring to make a spec change.
Merge branch 'Spec_Change'