Still need end of evaluate, math operations added