Second design.
merged.
Re-design for front end.