func all the things!

This time with less .orig