FIX_CHARGE into unpassed charge specs
Merge branch 'charge'
charged_in from charge_structure to charge