Patch Set 3:

Looks much better but didn't have the time to fully review.

- the commit message needs to be reworked since the IResource representations are gone
- this change clearly needs a CQ