Added logging with log4j...?