initial commit of Midori's work