all the things... this should have been much more atomic.  sorry.  =[