Modifying stack more. All return path should be good.
Working on sending path next.