First crack at mavenizing