Massively improved.  Added actual option parsing.