checkpoint on refactoring server bits into just the consumption bits.  still wip