Suggestions for a containment solution - (Update 12/18 in first post)?