Walker NTID phase 2

Walker NTID phase 2