Added a bucketload of command line options!