Began refactoring frequency functions with a :from option; specs pending