Ongoing work with AC control integration