Key fields should autoincrement
fix merge conflict
God only knows. I've lost track
fix merge conflict (I think)