Finish ongoing work
First version of design choices