class based peasy, simpler api

class based peasy, simpler api