Rewrite of Parse to test

(kept old code, commented)