Changed types, reworked things into folds
Changed types, reworked things into folds
Updated readme
Updated readme, new types