nearly done on tut1. Commiting to sync with DICE.