Making some changes, adding the gradle build, etc.