Revise based on read-through

About to make major change.