Protection draft

Intermediate for review
cleanup