Initial commit of CB implementation
Remove CB testing
Fix testing units
Merge branch 'feature/cbimpl' into develop