WIP: edits with jeff on the phone 2