pulled the crazy changes and fixed up pom.xml