Made a few changes - passed argv1 and 2 to the static class