Unit tests pass, next iteration
try {} stmt
moved few funcs to util.c
refactoring with struct v7_pstate