Redesign Initial Commit