Finish up

Implement David's recommendations