WIP Add settings API
Port to new settings API