Calculating actual container size vs. estimated.  In both cases, running through an encrypted container recreation process if capacity exceeded.  Significant code cleanups and reflows needed.