Merge dev

- scaffold out settings state