Branch is now in Calculator class