Parser looks to be basically done