start on refactoring AssignmentBundle