Messy attempt at moving claimdraft to session.

:-(