Paper revision, fleshed out p1