First version that works, CLI only.