merge new files from calblock_does_all branch