Add time, looping and formatting