Abstracting that entity woopity wapp
Merge branch 'test' of https://github.com/thomas4g/2340 into test