Started work on patch-resources installer relationship, and also simplified some things. Do not touch, explosions likely.