Runtime code
Cleanup
Adding controls
Fix doc for insertion
Cleanup