refactoring, broken
some refactoring - broken

meant to make life easier when adding lots of 'fake' resources,
introduced a strange error with last step, yet to be found