Still incomplete :).

These changes add functionality to the properties logic.