wip: more simplificatino in progress