Working on parsing
Fixed conflicts
Updated Xcode sample