All tests passing
Finish command line options and testing