Updated with overall plan and layout.