Less problems less homicide.

Will stick to the new classes for now.