Adding Lavinthal
Minor tweaks
Merge branch 'newmodules' into jeff-donna
Merge