Add guard

It even integrates with emacs to notify!
re-add the movie model and view