Touched base and updated with most of the recent Underscores changes