Let's just merge this as is, I'm going to try to redo it with OpenStruct for skunkworks