Closes #760

All the 716 stuff is in here - do that one first