Moving map values average into separate class