hacking on better branch support