first commit on new redesign