Big update - rebuild a lot of code while working on the tutorial repository