Added modularity by changing to using a change struct rather than individual integers in many places