Done final

Got parse stuff left tho