Initial Save of Shibata-san's code