repeated yak shaving, move to a method?