Added investigators form, new class