Final Draft one

Believe it is complete. Bug testing to follow