Adding in rewritten FovCalculator