Refactorig the code - Android Lifecycle- WIP Build - Build OK