More Market class work