Half a commit

grumble school grumble bastards grumble

fetch is coming along nicely though