Removed some code from parser. Still a long way to go to get things working.