More fumbling around.

I think there's a refactoring around the corner...