refactoring what gets passed around..
more of the same.