Did some more code

EntityManager won't inject correctly - thinking about having to start
again with the EJB as part of the web system.