Redesign containers, add graph prototype.