files from fawlty branch
Merge branch 'feature/controls' into feature/firstTimeUser