I'm waiting for Fable to come back online so that it can do the refactor while I sleep, for peanuts.