Making this whole thing a command line tool only