Added docs, which still need work. Solved a minor conflict after merge