Revised Solvent Tracking

Needs more testing