started new tutorial
merge