refactored WorkContainer in preperation for tests