Parsing working. Improved search outstanding