Some things working again. Still need to fix something with dependencies? Or just MatrixContainer?