Add better option parsing.  Add some data files.