video1 19:00 - refactoring complete - new features begining