Added tutorial framework; plus options