Data Classes and some small additions
The old stuff