changed some stuff to Walker, because right now I'm doing some duplicate things