More reworking.
A bunch more reworking.