Container refactor work. Compiles, but data needs to be set up again + everything needs to be verified.