WIP, trying to get gradle files sorted