First code of check in of "working" parsing code