Begin to better the tomcat integration.