Some restructuring.  I think this is a little more 'go-ish'.  What do you think?