Merged Joro's work and finished entire doc