Adding a newline here
Considerable simplifications to the design of the containers, also fixing some interfaces that didn't work the way they were alleged to