Minor class design changes and status report