Progress on argument parsing, splitting code into multiple commands