Making progress. add-branch was broken, still has issues