Started on par2 integration. Test should work now.