Mavenize Attempt 2