A just add it all
Start to work on redesign