More work on the underlying resource stuff

Signed-off-by: HACKhalo2 <hackhalo2@gmail.com>