More stuff needed to get branch to work elsewhere
I missed some important checkins