Initial pass at auto-add to clb functionality