Added time and space stuff to diameter function
Added the rest of my tallies