More progress
Fold implementation complete