change organization a bit.  simplify.