First pass, add debug functionality to Android