Made a commit so I could review the pull

It looks pretty good.