More work on property class.