Reworked options/arguments.  Added demo mode