Added a search tool, started refactoring math operator execution