Use a matrix to offset the objects
Small refactors