First draft new settings creator ready for testing

Change-Id: Ie6f1357c0a4c61418a6e9ed1f4b7da1e668f6202