Updated and additional methods

Reorganization in preparation for more work on this.