Updates

I should clean out WHCC related stuff.