DRY task definition

Also allow whitehall 4, 5, 6, and 7 to be done ;)