Got the sorting running, only some cosmetical stuff left to do