Added rudimentary parse-ing