Starting work on refactoring the TV Class, as it's currently way to heavy