Got initial parse almost working