Updated Initial work on attribute permissions.

As per request in #17, I've updated the request to be based on the latest master.