Fork of Instructor's old client project