Add critical bug to custom matrix
I
m not sure how, but bug has been fixed.
Refactor updates
merge conflicts
Begin building WPF