WIP converting previous functions to Matrix instances.