More Class

committing more inclass changes