interim commit; setup classes