New architecture in progress.

And once again, I thought I commited it all ...