Initial commit.
Fill out parser some more
Merge with github