- remove mapping fn - add mapping plugin base class (derived form plugin class) - change calibration classes to replace mapping plugin instead of mapping fn - remove gaze from pupil_positons and use event instead