WIP in using a faster matrix implementation.