New draft. Theos to add tables