Prepared Shape.hs to add folds