First commit including kill switch and log display