Some work on property access.
- Fixed conflict