Almost have parsing working