Now with working controls