Completed and Refactored setup of third container