Cleaning up new release code. Settling on an approach.
More cleanup and adding new ideas