merged new Cleaver2 work into this repo