Parser fixed, need to add some tests