Property Tracking is working, close #1