Too much stuff to list, mass git sync from months of changes