WIP Add all 6 namevar components