class 4/22/14

small updates to engine. Thinking about redoing it completely.