data class

most of the queries.. heres  a start, i need to clean it up a little