Populating cmd, secondary-nav nearly there