Add a small weighted average, not really done or tested yet as far as i can tell.
Starting some work on getting the averages proper