Initial attempt at adding compensations.  Incomplete.