Command line parsing changes now compile, but don't work properly