parse: Updated ID assignment and failing unit test
parse: deep mess now.. deep, deep mess