Total screw up going back to a branch that I know works