Enrique's solution
Infinite scrolling grrrr
Merge branch 'feature/inputowhaa' into develop