refactoring

+ experiment with screen capturing