Some edits. Edging towards being done.