Feature/data classes cont

Data classes should be done now... Yay!