Initial work on incorporating subtitles per #47