working through new control flow