A whole shitton of work, core update, module updates, additions, etc. Probably too big of a commit.