Refactoring models and utils. Working on adding rolling scores.