Move common code into base class, preparing for videos!