merged in working walking, still need sanity checks