Doing more changes.

Keep ContainerVerbal out for right now. Still adjusting things