updated to use modules used on existing servers.  Tomcat module needs work