Added (poor) command line arg handling