more tests and debugging, getting closer