Parser working correctly now.