FIX: Add calibration and multi-start