not compiling yet
other batch of fixes, still not compiling
one more step