Preliminary working: handshakes.
Demo site: updated for handshakes.
Tidying of HTML: done.