Attribute redux1

Should have given the branch a more appropriate name.