Refactored the command line like crazy. Unstable at best.