added formatting and querying for shifts