Updating following changes to TM2

Have also added a new file 'draft' which contains major changes - for review & feedback please.