Progress on formatting