Term & Quarter calculations added.

Additional tweak to RepeatFreq case statement
Not working ATM, I suspect that a logic statement is being greedy.
Shouldn't be a significant problem to resolve later.