Added comments to all areas that need to be updated to implement CBS