Add some things from tutorial