Security

Review branch for new security model.  I'll do the final merge as a squash, since the history here isn't particularly interesting.