implemented more of the container and one of the templates