Data classes + additional fidgeting