Revert "Revert "rework""

This reverts commit cca91766b3a1ca1f9c38b9bcc3914bc099f11de8.
Merge branch 'master' of https://github.com/KasperFranz/SU-project-El