Bring in Brian's changes

This is By Babbitt For Babbitt, bringing in Brian's Lasy changes to TWU.