class 4/17/14

basic changes to engine.