Add Extra settings. Merge with Dan’s code and fix issues with merge. Clean up code for demo.