Bort med dataclasses
Revert "Bort med dataclasses"

This reverts commit cc31797eedd9b3188387bf8c0200a861c816e87f.