Reintroduce Sean's build.gradle and make it work
merge