More build.gradle work, building is now effectively fully automated.