dev: more work, don't remember what
dev: work with log and control flow