Tidied up HTML, added some comments and added the stub member class