Fixed view.  Enhanced logger.  Cleaned directory & tests.
Removed switch statement & file.