Move away from standalone into a library - Create Parser class - move methods from expression -> parser (parse, evaluate, etc.) - add customization - custom ops