Complete general and android sections + refactoring