Refactoring
Refactoring v2
Reading data from local db.
Previous commit bugfixing