Preliminary web interface and pairing refactorings.