More work upgrading to Durandal 2.0