Continued work on gradle build files