Demonstrator working and a number of compilation issues fixed.  Still doesn't deploy to JBoss, though
Adding a file back in that had gone walkies