Revert "Revert "Fyrsta commit""

This reverts commit d672d9e276f3ecae250913e69b153d95938e3f59.