Revert "Fikset sum, sortering m.v for finalstage"

This reverts commit 0632481e4e54af196e3d87939768097be8f79a31.
Revert "Revert "Fikset sum, sortering m.v for finalstage""

This reverts commit 971022f5feb531a657b7b097028aab48dff7e6fd.
Merge remote-tracking branch 'origin/master'