Separate out modes from Fathom.

Needs tests. Sometime.