phase 1 of my edit.