Buildable code, and got the Maven part fixed :P