Made some progress, still not done with p8