ADD: Testing
Merge branch 'master' into Models
ADD: number of resources given rings