- refactoring, starting to implement statistics