Added testing!!!!! And rewrote some User Listing And Offer data class specifics