initial commit of Ian's work