Renamed Query to Formula. Prepared for Regression. Added unit test.