pull request

The code that we had last week looks like it's working now that I cleared out the database first.