finished draft docs
merge conflicts