added class stuff w/ kitten problems