First cut at adapting for qbranch.