Almost Finished

Something broke when I added the command line handling