changed names of directions to be easier to read
not compiling, but progress
fixed tests