Added p2 stuff to submission folder and fixed something that got introduced by a merge into the p2 code.