begin refactor to control
data structures skeleton
all content refactored elsewhere
content consolidated