wip: more simplificatino in progress
wip: broken