Added a common embedded module, and began DRY'ing up the embedded containers.