all tests pass again
developing new methods for result and photobooth
merge conflict