some infrastructure and start of more folds variants of cats
Merge remote-tracking branch 'origin/master'