Changed approach to methods only in sonar derived class.  Ready for testing.
Nil.
Starting to refactor switch statement.
Seems to be working.