Started messing with CBL implementation