Finish implementing prev commit.

Messed up add -p