For now it is probably worth leaving the refactoring on the pycontainer itself? Since I'm refactoring that anyway?