Updated to new Durandal (prev now in old branch)