Finished enable/disable and separation of enable from properties