Implementing the new modes.  It's getting a bit hard to keep track.