wip
simplify... some termination issues
still issues with termination