Adding P16/P17 solutions, starting P18