Refactored a bunch of things and added back in all the original TVC's