progress towards class model