Completed Container rewrite

Now it’s super easy to add new containers!