The design of work has been shown to influence a host of attitudinal, behavioral, cognitive, well-being, and organizational outcomes. Despite its clear importance, scholarly interest in the topic has diminished over the past 20 years. Fortunately, a recent body of research has sought to reenergize research into work design by expanding our view of work design from a narrow set of motivational work features to one that incorporates broader social and contextual elements. In this chapter we seek to review the literature on work design and develop a framework that integrates both job and team design research. We begin by briefly reviewing the history of work design in order to provide needed historical context and illustrate the evolution of job and team design. We then define work design, particularly as it relates to incorporating job and team design elements and transitioning from a view of jobs to one of roles. Following this, we identify a comprehensive set of work design outcomes that provide the basis for understanding the impact that different work characteristics can have on individuals and teams. We then offer an extended discussion of our integrative model of work design, which includes three sources of work characteristics (task, social, and contextual) and the worker characteristics implied by these characteristics. Having defined the range of work and worker characteristics, we then discuss some of the fit and composition issues that arise when designing work, as well as discuss the mechanisms through which the work characteristics have their impact on outcomes. Finally, we discuss research into informal forms of work design.