Managing the cross-branches is starting to annoy the shit out of me