Main uses flags for time shift.
Started on formatting.
Merge branch 'master' into breakup