Added data and aria stuff.

Should fix #14