Updating the rest of the control types
More work on new interacts