Work on fixing parser