Done more of StateT