update from nutting

trying to pull this back into my repo