Stashed all local changes.

Be ready for a complete rewrite...