Added many pt2 stuff

Sorry for the code drop, I will probably
split the commits.