Adding files it needs.  Too lazy to rebase