Cleaned up some areas and finished getVideoObj