Initial completion of MovieTagger update (from tag.py)