Unfinished Android problem fix, ready to refactor