Added logic for adding Properties to the flat data structure.
Added remaining logic for node types.
Fixed a few issues, runs successfully.