Get initial working demo of the auto cleanup makeContainer

WIP