Refactored database and code, I think.