First attempt at including charge, currently breaks after
self-reconnection.