slight reorg doing two modernism themes at once