Small refactor
Small refactor
Dont keep references
Keep matrix instead of tuples of translate and stuff