Made this an application so it could run.
Add code coverage.  Add test to cover missed functionality.  Start using a good coverage tool sooner next time.  Removed some unnecessary public keywords.