Adding changes to handle tomcat being up to start with, then using only restarts to interact with it