Second commit of programming-bio branch