ngasbarr-commit-2

I believe I did the rebase this time.