Rearranged Classes and Started on Pay Command