parsing now in new class, added some test, need more fancy ideas for
testing...