edits started on -03

Still need diagram to make it easier to follow some of the scenarios.