Started working on data class