Changes to the parse stuff. (Broken)