Rework everything, use references

Created by  Henrik Tjäder  on April 2, 2021
OK5CKW6E72XAZTRJUWSKFPJBPZYNIWQGVXFR5ARSJHB6EIBMU6WQC
Change contents