more parsing.. gotta organize data now