Update documentation, strip out obviously under construction code to be introduced in another branch