Added Competition variables, and changed most of the constants to be
based on the new Competition variables.