not compiling, but progress
fixed tests