The other half of the commit

grumble school grumble bastards grumble

get is done!