Other than queries, I want to say the database stuff is pretty much
done.
Merge remote-tracking branch 'origin/master'