Trying to get this a little more maven complient, hopefully to the point it runs