Started on part 2. Tests created to check (yay tdd). Need to implement
command line checking to actually run the function.
Fixed conflicts