Added command line options, and linking now works