Workarounds in place to make the initial concept submit less flakey - refactoring needed