Refactor, get real initial data
Refactor
Add statistics