Rough outline of DIYPS functions with refactored carb algorithms
Merge branch 'master' into wip/iob-cob