Started merge with old docs from F. Arslan