Draft-final

Almost done.