Add better command line parsing.