I'm by no means an OOP guru, but if anything is passed through a dozen source files, I start to feel a bit queasy.