Refactor, add scorer