WIP: refactor / fixup