Pull Request

Pulling Jesse's changes to my fork.