initial safety commit  - work in progress