Reworked command line stuff for possible future use...