Continued work on p2, doesn't work yet