WIP
WIP
some work on index for controls