Added charge, more proper treatment of lifetimes.
Merge.