Moved Gui/Container code out as well.