Passing as manying linting tests as possible without a code structure change
Moved part of the investors query into a concern.  Updated linting config.  Added some new pending unit tests.