Roaster, RoasterGenerator, and Shift

Sorry for the previous roll back stuff. Now we can get into business
again ;p