Updated to 1.7 and switched to gradle as a build system (Not finsihed yet will not run)