Modularity with Charms and Ends