Adding in selected classes for the initial values, and for the currently selected... also did some minor refactoring
fixes issue #21