WIP - working on a single code path for layout attributes.