Refactor to remove input via manager
Merge branch 'feature/injection-for-guards' into develop
Merge branch 'develop'