Closed #18 - new Controls