started finished up some parse stuff