Got routes working and aggregate numbers reformatted