Complete MVP Model; update working getDiagonal function.