refactored singleEquation some more, but broke the build