Fiddling with command-line callable version.