done with tests and more pics