Updates to base functionality and add CB Views