progress on bitname fork handling