Starting on #707. Add old code macroed out