Did some refactoring for genericity of the guts of the system and a couple odds and ends.