WIP. Code cleanup.  Added a single class view with map to test routines.