Finally made the container work decently well