PJE 12

First stab at PJE 12 - has compiler issues