Some changes. Adds the ability to build via maven