I think this is a pull request? trying to merge stuff from DavidNew

help