add push, pull, and today (plus formatting)