Beginnings of container refactor