Closes #758

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