Physics work + containers refactoring