Parser now working, but still has bugs