Forms merged into one, with introduction of a new class to handle video uploads