Everything done (including diagram)

3/19/2014