Trying to get Christina's latest changes.

Submitting a pull request but I can't tell which direction it's going in! :)