Finished all p1 issues