Reworking shape script
Merge remote-tracking branch 'origin/master' into Scott
Added the shape script to prefabs