start work on uniform matrix support