Final commit of draft 4/7