Initial design

given some comments