Starting to break things out into parameterised methods