Lots of work on pom to make this releaseable