More work on programs in individual classes