moving to data instead of attr, plus testing on