Start adding summary info - needs to be generalized to laps