More work on Buzzsaw rendering
I hate merge conflicts.