Commit Upstream Please
Client, Server + tests copied in from MEME. Testing to be done tomorrow

P.S. Talk to Alasdair about a template for commit comments
Suggest Template for Documents to Alick