Add first pass of auto injection
Remove unncessary console.log and correct statistic name
Merge branch 'feature/auto-injection' into develop