Moore Changes
Did some more Contour stuff