Pre-refactor, tally solved