Started work on property enabling / disabling