moved expression evaluator to own library and begun testing