Less of a hack, but needs work.  Continuity is suffering.