Simplifying function overload a bit
Fixing matrix interface to actually work