New commit - almost complete class