more structure work - WIP