Much nicer high level term controls