Intranet-number-gen., missed time punch, finley
Merge branch 'intranetedits'