Working stuff, doing pull request. CTRL-C problem remains.