Merge in Tutorial Functionality

yup