Started organizing for new layout.