Continued work on Formula parser