Patrick, what's the status of your website refactoring? This is getting more and more important. Would you please wrap up everything you've done so far in a patch and post it? It doesn't need to be perfect, I can do the rest. Thanks a lot!