Add state object
Store geometry in separate matrix