Bring in Brian's changes

This is being created by Babbitt, for Babbitt. The latest Lasy changes should be brought into the TrinityWestern version.