Rewrite for Moovie. All TDD