Level18

Adding level 18, waiting to add tests until Matt has merged in his branch