FINAL DRAFT! ...maybe.
Fixed merge conflicts.
Minor changes.