Major changes to accomidate the video player code.