CLI simplified, now uses Saper#run