Design 1st draft
Small changes after merge