Make into command-line options (I did a TODO!)