P2 Boarding initial commit