starting to change charge* classes