Readded the shapewrapper and changed wording on Team page

This one is set to merge back in.