Folds implementations and tests. Updating selectors for new API. Coverage at 53%