Big changes to Tutorial, first have done
merge resolution