Yeah. Actually, once everyone's happy with this, I need to go and cleanup all those attribute/elements not in use any more.