Cleaned up structure surrounding stats representation. Next step refactoring code and connecting changelisteners