Finally found a good branch setup for this kind of stuff.