created snapshot. started refactoring