Perhaps a little cleaner pom with latest libs, but code is to be fixed