Updated for matrix method...still working through