BROKEN: started using Matrix to represent clock, test needs work