Added new lookup system, working on expression eval into parsing