Part 8
Part 9
Finish off gradle conversion