Test Run

First time I've actually run the code since all the changes, fixed a
couple of errors.  Running well.