Tons of stuff.

RECOMMENDED: accept pull, update the Server, get a tour from mac about what's added and if didn't like, revert merge or remove unwanted stuff.
It's a surprise for you, and you only, N. ;)