work on one step picture save + some refactoring