Redesign commit 1
Redesign working
Redesign working 2