Structure work for moving to a StateT based approach