More tutorial things
Partial revert "Follow along with tutorial"
Follow along with tutorial