Data changes

working on the data class, not yet ready
Data

meh. continua merda